From f6fe2dead9c81ca6d4699c7911604c1961501628 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Tue, 2 Nov 2021 11:30:10 -0600 Subject: [PATCH] retire TopoMapPro Places File format (#711) * retire TopoMapPro Places File format. * remove topomap pro reference files. * catch serialization references up with tmpro retirement. --- CMakeLists.txt | 2 +- GPSBabel.pro | 2 +- tmpro.cc => deprecated/tmpro.cc | 0 reference/format0.txt | 1 - reference/format1.txt | 1 - reference/format2.txt | 1 - reference/format3.txt | 2 -- reference/help.txt | 1 - reference/topomappro.txt | 10 ---------- testo.d/{ => deprecated}/tmpro.test | 0 vecs.h | 9 --------- xmldoc/formats/tmpro.xml | 10 ---------- 12 files changed, 2 insertions(+), 37 deletions(-) rename tmpro.cc => deprecated/tmpro.cc (100%) delete mode 100644 reference/topomappro.txt rename testo.d/{ => deprecated}/tmpro.test (100%) delete mode 100644 xmldoc/formats/tmpro.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index cfaf4a65c..2c1dfbf75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ set(MINIMAL_FMTS set(ALL_FMTS ${MINIMAL_FMTS} gtm.cc gpsutil.cc pcx.cc - skytraq.cc holux.cc tmpro.cc tpg.cc tpo.cc + skytraq.cc holux.cc tpg.cc tpo.cc xcsv.cc tiger.cc easygps.cc saroute.cc navicache.cc delgpl.cc ozi.cc text.cc html.cc diff --git a/GPSBabel.pro b/GPSBabel.pro index 1bbb8d0cf..0bd2a2696 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -60,7 +60,7 @@ MINIMAL_FMTS = magproto.cc explorist_ini.cc gpx.cc geo.cc mapsend.cc garmin.cc kml.cc wbt-200.cc ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \ - skytraq.cc holux.cc tmpro.cc tpg.cc tpo.cc \ + skytraq.cc holux.cc tpg.cc tpo.cc \ xcsv.cc tiger.cc easygps.cc \ saroute.cc navicache.cc delgpl.cc \ ozi.cc text.cc html.cc \ diff --git a/tmpro.cc b/deprecated/tmpro.cc similarity index 100% rename from tmpro.cc rename to deprecated/tmpro.cc diff --git a/reference/format0.txt b/reference/format0.txt index d2a88d5de..bbb7aa5e1 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -135,7 +135,6 @@ tomtom_itn itn TomTom Itineraries (.itn) tomtom_itn_places itn TomTom Places Itineraries (.itn) tomtom_asc asc TomTom POI file (.asc) tomtom ov2 TomTom POI file (.ov2) -tmpro tmpro TopoMapPro Places File dmtlog trl TrackLogs digital mapping (.trl) tiger U.S. Census Bureau Tiger Mapping Service unicsv Universal csv with field structure in first line diff --git a/reference/format1.txt b/reference/format1.txt index 263a3744b..ef7198e1a 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -141,7 +141,6 @@ file tomtom_itn itn TomTom Itineraries (.itn) file tomtom_itn_places itn TomTom Places Itineraries (.itn) file tomtom_asc asc TomTom POI file (.asc) file tomtom ov2 TomTom POI file (.ov2) -file tmpro tmpro TopoMapPro Places File file dmtlog trl TrackLogs digital mapping (.trl) file tiger U.S. Census Bureau Tiger Mapping Service file unicsv Universal csv with field structure in first line diff --git a/reference/format2.txt b/reference/format2.txt index 605898a76..7250f49b7 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -141,7 +141,6 @@ file ----rw tomtom_itn itn TomTom Itineraries (.itn) file ----rw tomtom_itn_places itn TomTom Places Itineraries (.itn) file rw---- tomtom_asc asc TomTom POI file (.asc) file rw---- tomtom ov2 TomTom POI file (.ov2) -file rw---- tmpro tmpro TopoMapPro Places File file rwrw-- dmtlog trl TrackLogs digital mapping (.trl) file rw---- tiger U.S. Census Bureau Tiger Mapping Service file rwrwrw unicsv Universal csv with field structure in first line diff --git a/reference/format3.txt b/reference/format3.txt index 3c4e41df3..d59c5246f 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -1332,8 +1332,6 @@ option tomtom_asc datum GPS datum (def. WGS 84) string https://www.gpsbabel.o file rw---- tomtom ov2 TomTom POI file (.ov2) tomtom https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tomtom.html -file rw---- tmpro tmpro TopoMapPro Places File tmpro - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tmpro.html file rwrw-- dmtlog trl TrackLogs digital mapping (.trl) dmtlog https://www.gpsbabel.org/WEB_DOC_DIR/fmt_dmtlog.html option dmtlog index Index of track (if more than one in source) integer 1 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_dmtlog.html#fmt_dmtlog_o_index diff --git a/reference/help.txt b/reference/help.txt index 2eac8ef37..af672decc 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -664,7 +664,6 @@ File Types (-i and -o options): prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) tomtom TomTom POI file (.ov2) - tmpro TopoMapPro Places File dmtlog TrackLogs digital mapping (.trl) index Index of track (if more than one in source) tiger U.S. Census Bureau Tiger Mapping Service diff --git a/reference/topomappro.txt b/reference/topomappro.txt deleted file mode 100644 index 5837da3a5..000000000 --- a/reference/topomappro.txt +++ /dev/null @@ -1,10 +0,0 @@ -Group sID sDescription fLat fLong fEasting fNorthing fAlt iColour iSymbol sHyperLink -new GCEBB Mountain Bike Heaven by susy1313 35.972033 -87.134700 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=3771 -new GC1A37 The Troll by a182pilot & Family 36.090683 -86.679550 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=6711 -new GC1C2B Dive Bomber by JoGPS & family 35.996267 -86.620117 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=7211 -new GC25A9 FOSTER by JoGPS & Family 36.038483 -86.648617 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=9641 -new GC2723 Logan Lighthouse by JoGps & Family 36.112183 -86.741767 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=10019 -new GC2B71 Ganier Cache by Susy1313 36.064083 -86.790517 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=11121 -new GC309F Shy's Hill by FireFighterEng33 36.087767 -86.809733 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=12447 -new GC317A GittyUp by JoGPS / Warner Parks 36.057500 -86.892000 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=12666 -new GC317D Inlighting by JoGPS / Warner Parks 36.082800 -86.867283 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=12669 diff --git a/testo.d/tmpro.test b/testo.d/deprecated/tmpro.test similarity index 100% rename from testo.d/tmpro.test rename to testo.d/deprecated/tmpro.test diff --git a/vecs.h b/vecs.h index 67eaed96b..86a6f1d08 100644 --- a/vecs.h +++ b/vecs.h @@ -66,7 +66,6 @@ extern ff_vecs_t holux_vecs; extern ff_vecs_t tpg_vecs; extern ff_vecs_t tpo2_vecs; extern ff_vecs_t tpo3_vecs; -extern ff_vecs_t tmpro_vecs; extern ff_vecs_t tiger_vecs; extern ff_vecs_t easygps_vecs; extern ff_vecs_t saroute_vecs; @@ -277,7 +276,6 @@ private: LegacyFormat tpg_fmt {tpg_vecs}; LegacyFormat tpo2_fmt {tpo2_vecs}; LegacyFormat tpo3_fmt {tpo3_vecs}; - LegacyFormat tmpro_fmt {tmpro_vecs}; LegacyFormat tiger_fmt {tiger_vecs}; LegacyFormat easygps_fmt {easygps_vecs}; LegacyFormat saroute_fmt {saroute_vecs}; @@ -534,13 +532,6 @@ private: "tpo", nullptr, }, - { - &tmpro_fmt, - "tmpro", - "TopoMapPro Places File", - "tmpro", - nullptr, - }, { &tiger_fmt, "tiger", diff --git a/xmldoc/formats/tmpro.xml b/xmldoc/formats/tmpro.xml deleted file mode 100644 index 10e4be1db..000000000 --- a/xmldoc/formats/tmpro.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - Reads and writes places files for -use in TopoMapPro places files. As this file -type can store links other than web links, anything that is not a http -url will be discarded. Note that this does not do datum conversions, -so if your input file does not have WGS84/NZGD2000 data, your output -file won't either. The color of waypoint icons defaults to red. - -- 2.30.2